Clean up before making all setting page render edge-to-edge
am: 9db66a562c

Change-Id: I70c7fa7dc398e1d95d44453e9b3a3a7812b0205d