Merge "Fix colored icons in doze mode" into lmp-mr1-dev