Merge "Magic null-background filling for PhoneWindows" into lmp-dev