Merge "Fix all issues with SystemUI visibility and transitions" into oc-dev