Merge "Separated emergency option final UI"