Merge "Rename flag that enables showing display content with keyguard"