Merge "Clean up emergency app overlay intent" into qt-dev am: 69a08ff32b
am: b10e50aabe

Change-Id: I6d20a9edc4d2f1aeb6a8af917247ab1842fad353