Merge "Increasing size of lock icon on big screen devices" into sc-v2-dev