Merge "Revert "Move Nearby to the front of the app list."" into udc-dev