Merge "Fix UiBench MainActivity fragment"