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

Change-Id: I8aeee12fb4c7821f26ab9d443c7e2fbe17ac3052