Merge "Rename functions that disable status bar and keyguard" into mnc-dev