Merge "Don't trampoline twice when opening security or privacy" into tm-qpr-dev