Merge "Do not detect system gesture with new system ui state flag" into sc-dev