Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1