Merge "Fix security dialog bug" into tm-qpr-dev