fix rotation FC & remove duplicate menu entry

Change-Id: I8063c15c9cf8d46d15724dff491c97f194f30b39