Merge "Fixed keyguard inflation problem" into oc-mr1-dev