Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView"