Merge "Fix for the lock icon issue" into main