Merge "Add TRANSITION_EFFECT_OPTION for replacing image" into devel/master