Merge "Use layout parameters to determine lock icon location" into sc-dev