Merge "Vertically center the landscape navigation bar." into ics-mr0