Merge "Fix UiBench MainActivity fragment" into nyc-mr1-dev