Merge "Update LauncherInstrumentation to consider tablet w/o nav bar" into sc-v2-dev