Merge "Revert "Move BaseActivityInterface task size methods to DevicePr..."" into tm-qpr-dev