Trimming: switch to use selectors.

Switch into using 2 selectors for the starting and end point of triming.
Shift the bar up a bit to accommandate the selectors.
bug:7093240

Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72
8 files changed