Merge "Partial revert of ag/7508382 to retain back button responsiveness in...
Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev am: 4024769f
am: a8040cce
Change-Id: If2b8cd646275f77f8d17099fd3a728c551fd9c3c