Merge "Prevent unnecesary Surface preservation." into oc-dev
am: bf7f23cc9c

Change-Id: Ia88d0b9658d9804187cf053ae83338b978ffa69b