Merge "Add Energy Modes preferences" into udc-dev