Merge "Create a general mapping between window types and inset types." into...
Merge "Create a general mapping between window types and inset types." into rvc-dev am: e88d949e am: d7f1e2e0 am: cdb1cced am: 22603b76
Change-Id: I1887c9faae0bf0fa6d32b5849c37f064447bd98b