Merge "SeekBar track and progress should both be 2dp"