Merge "Don't do ambient display when in power-conservation mode." into lmp-dev