Merge "Make expanded title bounds start from top of Toolbar" into nyc-mr1-dev