Merge "AOD: Fix flicker when unlocking with fingerprint" into oc-dr1-dev