Merge "Update Adapter State after native layer complete"