Merge "Fix the flaky test case : testRecentsButtonDisabledOnSecondaryDisplay"