Merge "Fix issue where onKeyguardOccludedChanged isn't called when occluded changes" into sc-v2-dev