Merge "OMS: Make updates to category not reset the overlay's state"