Merge "Fix call to get the current user id from a secondary SystemUI process." into oc-dev