Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"