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: f0089745
am: d3920fe3
Change-Id: I0acbadead6786668eec525ccfbcf0c4dc4b44fee