Merge change 20509

* changes:
  Touch activation screen shown up fix