Merge "QS: Fix emergency calls only layout" into nyc-mr1-dev