Merge "Fixed camera flaky issue in monkey testing" into main