Merge "Disable ControlsFavoritingActivityTest" into tm-qpr-dev