Merge "Minor refactoring for instrumenting with background activity starts permission"