Merge "Fix bug 5386180 - Wire up action bar home/up for dialogs"