Merge "Change Adaptor implementation API in toolkit for multiple windows." into devel...