Merge "Settings: Fix fallback summary for power_button_instantly_locks preference"