Merge "Fix Security Settings padding"