am b28e34f4: am 4c177cbd: am 2c22d6d2: Fix and simplify advanced security settings layout

* commit 'b28e34f4c54eb5c3110420551ff2e8a1bf78a9c3':
  Fix and simplify advanced security settings layout