Merge "Fix emergency button overlap with nav bar"