Merge "Not hinting anymore when in power saver" into oc-mr1-dev