BUG:390583 Fix clicking settings making preset dirty. Also make harder to select lock icon
(cherry picked from commit d26f9f9706f06e833d2f72f14c57c2bd78b310c8)