Activity transitions

@vashisthg Kindly review and merge