Merge "Use current display surface size for custom rotation animation" into rvc-dev am: 281e6cefb5

Change-Id: Ibe83c9be405b63aa9639d026ccd31340bb016993