Merge "Make right nav button container unselectable" into pi-dev