Merge "Disallow fastboot to modify locked DSU" into main