Merge "Postpone updating idle states to after the boot."