Merge remote-tracking branch 'refs/remotes/origin/DEV_Branch' into Dev_Calender
修復離開App再開啓時畫面顯示問題
Merge remote-tracking branch 'refs/remotes/origin/Dev_Calender' into DEV_Branch
Merge remote-tracking branch 'refs/remotes/origin/DEV_Branch'