Merge "Properly position dataset picker UI" into oc-dev