Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev