Merge "Add hibernation NPE check and unhibernate only if hibernating" into sc-v2-dev