Merge "vendor: Switch to Lawnchair again" into q10