Merge "Move airplane icon to its own view" into jb-dev