Merge "Fix bug 5049406 - ActionBar UP with no home icon, tap highlight looks broken"