Merge "Update UnlockMethodCache when keyguard visibility changes" into oc-mr1-dev