Add circle gear to display options [1/2]

Change-Id: I4cdc5a8d27663a6d1e9375b76b0942dac4239223
Merge "Add circle gear to display options [1/2]" into jb42