Merge "Added maxTargetSdk and tracking bug to USE_VSYNC flag in choreographer"