am 535f6eac: Merge "Fix issue #5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500" into ics-mr0

* commit '535f6eacb9bd508caac463a12ab69be1cd58c5a5':
  Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500