Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev