DO NOT MERGE: Only restore the positions of types which are controlled

The client can only send the requested visibility to the server when it
has the control. Before that, the server doesn't know the requested
visibility of the client. We don't restore the visible-system-bar
position in this case.

Fix: 161247175
Test: Steps in the bug
Change-Id: Ibbcd2fac352a5349ec24b5a6361f3e48d16f5a05