Merge "Enable activity rendering during window animations"