Merge "Add setOpaque to TransactionCompat" into sc-dev