Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev