Merge "Fix the NPE crash when device reboot with hide cutout set" into tm-qpr-dev