Merge "Re-enable leak detection on tablets" into sc-v2-dev