Merge "Fix build: Revert "Add potential future APIs for postmessage""