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

Change-Id: I9d40f6e4035f8cfa07de512f1327722e93c04302