Merge "Add resume from hibernation in first stage init" into main