Fix timeline settings for beta

Change-Id: Ia7bea5ce148307cdb9dc1c4e35e6f2832fc9706c
Merge "Fix timeline settings for beta"