Merge "AdapterProperties: Crash on invalid state transition"