Merge "Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: 4e68b98b47" into rvc-d1-dev-plus-aosp