Merge "Fix memory leak for test where shade is not closed" into main