Merge "Hide framework-minus-apex"