Merge "Add hibernation NPE check and unhibernate only if hibernating"