Merge "Make expanded title bounds start from top of Toolbar" into nyc-mr1-dev am: 6f828f29f9 am: c41db0cf79
am: 6ea1f11b38

Change-Id: I517c67d9b708a309ada81b5f454a61e5ebc0ca19