Merge "Only update lock icon views on the main thread" into sc-v2-dev