Merge "Uphold common ordering expectations around action bar Home/Up dispatch" into jb-mr2-dev