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

Change-Id: I316dfc1665521683f7d2bde394109dd73182e86d