Created a branch with only ScreenActivity feature