[WIP] Use activity lifecycle callback