Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev