Merge "Update lock icon location onConfigurationChange" into tm-dev