Merge "Use default switch preference view if gesture animations video is not...
Merge "Use default switch preference view if gesture animations video is not available." into nyc-mr1-dev am: 2dc974a6 am: 41a32a2a
am: 9d283f31
Change-Id: I5354639c64883ab4f8044aedc9cf54db58b6bd76