Merge "Move legacy menu key to bottom right on sw600dp." into jb-dev