Merge "Fix gesture preview image visibility not set correctly." into oc-mr1-dev