Merge "Fix bug 5143392 - Add padding to left of action bar app icon to prevent icon from moving when drilling into hierarchy"