Merge "Disable ControlsActivityTest and ControlsDialogsFactoryTest tests" into tm-qpr-dev