Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev
am: 4024769fd1

Change-Id: Ib1876cced4fc9e279a77eed5888193aa9c4f08aa