Merge "Merge "Clean up emergency app overlay intent" into qt-dev am: 69a08ff32b am: 3e667c25cb" into qt-r1-dev-plus-aosp