Merge "Move code for handling uid obs "cutoff" to activity manager"