Merge "SurfaceFlinger: rename use_smart_90_for_video flag"