Merge "Move logic from SavedAccessPoint fragment to controller"