Merge "Fix animation in shelf is not notch aware"