12 OCT Fix Bug on Setting Activity to auto update Time and extend DB phase2