Merge "Add AppOps overload to be able to watch foreground changes." into tm-dev