Merge "Fix scrolling goes under the expanded action bar" into tm-dev