Merge "Have DisplayContent be the call point for assigning window layers"