Merge "Create a general mapping between window types and inset types." into...
Merge "Create a general mapping between window types and inset types." into rvc-dev am: e88d949e am: d7f1e2e0 am: cdb1cced am: 22603b76 am: 014484f4
Change-Id: I312dd91e45abb07f78d595f791fcef8d101de0a2