Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev