Merge "Stop removing raw status when device is disabled."