Merge "Don't allow enable/disable of tuner on lockscreen" into nyc-dev