Merge changes I573e4fb9,I8e7baadc into oc-dev

* changes:
  Drop the misc and not smear it.
  Smear screen power usage based on activity time.