Merge "Adjust toolbar/action bar title handling" into lmp-dev