Merge "Prevent arrow popup from going off screen bottom when below icon." into tm-dev