Merge "Adding more test coverage for QuickSettingsController" into tm-qpr-dev