Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev