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

Change-Id: I44684abcf2aa63169e36569d360e129276247ade