Merge "Create a general mapping between window types and inset types." into rvc-dev am: e88d949e0a am: f9163f4539 am: 3c2c5fdd45

Change-Id: Ic486b1993aaef2f2b02204d254cf4fffa2c48994