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

Change-Id: I21261eabf885ed5ef28a6b09ce2210e6a18ddccd