Merge "Fix synchronization on a non-final field 'sInstanceLock' by making it final." into ub-launcher3-dorval-polish
am: 98e063e6df

Change-Id: I5dd3e60f39a33645b8d29b64d975384047eceeb0