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