Follow upstream changes and enable CRUI supports
Update to 3.12.3
Update to 3.12.4
Update to 3.12.5
Update to 3.12.6
Update to 3.12.8

Merge upstream changes