Merge "Fix black screen upon awake (reused after free)"