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

Change-Id: I4e66dcace4e30ac22031e6bbf8aeebefdea78f95