Merge "Disable Keyguard chatyness" into mnc-dev