Separated the cycle setting screen and the actual counter screen.

Change-Id: Iac2baa6fd68701e422d630fb5c79b0d4f372d8cd