Merge "Do not count AOD showing changes as keyguard's" into rvc-dev