Merge "ApiCouncil review round3 / setHidden, Query.getExtras" into sc-dev