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

Change-Id: I5def3bb27f95efb00ebb1b1caed05e06a4e3d57c