Merge "Show lock icon in restricted settings dialog" into tm-dev