Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""