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

Change-Id: I2f4c161376927cb526419fadb195c155a67b7e3b