Merge "Guard against a nonexistent dream settings activity." into main