Merge "Added rules for status/nav bar customization when in multi-window mode"