Merge "Use default switch preference view if gesture animations video is not available." into nyc-mr1-dev am: 2dc974a648
am: 41a32a2a5f

Change-Id: Ia0cf4f60d994b947f36efa7c301d45c6606df6a8