Merge "Ref count isolated uid use for long partial wakelocks" into tm-dev