Merge "Split inheritance structure between OpenAppFromLauncher and OpenAppFromLock tests"