Merge "Remove WindowlessWindowLayout"