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

Change-Id: Ib2196eab30d6710b1f690b0c1724e8756e87a123