Merge "add missing break for Activity options"