Merge "Don't wait for screen on to finish animations"