Merge "ReolverActivity: try auto launching single choice" into nyc-mr2-dev