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: f9163f45 am: 3c2c5fdd am: d768c0e3
Change-Id: Id8690774f09c3f78b2594cf08a884566f1763202