Merge "Move Emergency call button"