[automerger skipped] Emergency shortcut button UI fine tune am: ac89c262e2  -s ours
am: e6a9f204ae  -s ours

Change-Id: Icb6ad376a6eb80f334e33b3664b074d70cef6e03