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

Change-Id: I2673b32cd6945aff7b095b58ce111a9776c57e7e