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

Change-Id: I3cd753050489728c6bf1fdf12f315d444a49cdd7