Merge "OMS: Setup state for users on boot and when added" into oc-dev