Merge "Fixing shade expanded after unfolding and unlocking with fingerprint" into tm-qpr-dev