Merge "Move Emergency call button" am: 2501f6e268
am: 251411674b

Change-Id: I97e20041d520f2795affe8c66e1d12e16ec5cfde