Merge "Disable accessibility focus on the instruction video in magnification gesture screen." into nyc-mr1-dev
am: 131988f1ea

Change-Id: I934a6368af1ba29a59092a3cad8c46870e5c8455