Fix for unrelated request end canceling prepared view change (#14642)

Change-Id: Ic306b9d14427763194973c839310b125b211bbd0