Create display calibration category and move color calibration to it

Change-Id: I83f4ae1935cbf26a7d63ac05c09a6afacee971ca