Merge "[4/4] Move new picker logic to AOSP" into sc-dev