Merge "Update lock icon location if auth setup is delayed" into sc-qpr1-dev