Merge "Revert "Revert "Dismiss Auth Biometric Prompt when expanding shade""" into tm-dev