Merge "Allow activities to show on user 0 until provisioned"