Merge "Fix a timing issue in unlock signal propagation in AppSearch" into sc-dev