Merge "Fix NPE in app hibernation dump command." into sc-qpr1-dev