Merge "Displaying the base activity's icon and app label in app header" into main