Merge "Don't disable radio from thermal if in emergency call only." into sc-dev