Merge \\"QS: Fix emergency calls only layout\\" into nyc-mr1-dev am: 7d4fc00aaa
am: f69645b0a8

Change-Id: I0c76255346c00afe5ed2f6770e46d9074c76e4d3