change activity flow sequence

Signed-off-by: ivanalayan <ivan.alayan@orangeandbronze.com>
Merge branch 'development-branch'