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

Change-Id: I2f971c99a3610ef39ae5541f7498f87611d02add