Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev