Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev am: 0cdc7c8874
am: 294176e988

Change-Id: I7332f731883c94f49477258357b3b392b4e21961