Merge "Center airplane icon in its frame" into pi-dev
am: ad9c39d571

Change-Id: I3ea27ceb7ce38ca8647cc9c72add1d91e99e9780