Merge "Cleanup taskbar touchableInsets" into sc-dev