Merge "Handle unsupported operations in the time consuming pref activity." into tm-dev