Taking "movetoolbar" and "rankselector" out of experimental features

Change-Id: I6bbe4f075e175738690d626fdc27b853d1bd23b0