Merge "Fix all issues with SystemUI visibility and transitions" into oc-dev am: c5b2bf1818
am: a2f880d453

Change-Id: I0a18f72acf5dbeb29d0c28adac93955e09aa5e53