Merge "Postpone updating idle states to after the boot." into rvc-qpr-dev