Merge "Fixed keyguard affordances" into mnc-dev