Enable CentralNotice client banner choice a few places

Change-Id: I612c00f711609542a35cfa9770ae2c738349f1ee