Merge "Use magic number 320 for viewport width snapping." into klp-dev