Merge "Launch overlay emergency app by feature flag" am: 8eaf372753
am: 681c5128e5

Change-Id: I8f6fc346c5526a307e1c76b47cad875b4b510be0