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

Change-Id: I899838fa6cf072bd77221d839256759144329879