Merge "Abstracting out state handler logic into base classes so that it can also be used in different activity" into ub-launcher3-rvc-dev am: eb0136b7c4

Change-Id: I951cd086091f97ab5b61635af74582287e3a449e