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

Change-Id: I9af839817656c2abefe5080cc7663c65181f1228