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

Change-Id: I1887c9faae0bf0fa6d32b5849c37f064447bd98b