Merge remote-tracking branch 'remotes/origin/locky' into test

Controller/SensorGateway/SmartSceneController.py

@@ -1152,6 +1152,8 @@ class SmartSceneView(View):
                 time_string = CommonService.get_date_from_timestamp(now_time, tz)
                 time_string += ' {:02d}:{:02d}:00'.format(hour, minute)
                 time_stamp = CommonService.convert_to_timestamp(tz, time_string)
+                if time_stamp < now_time:
+                    time_stamp += 24 * 60 * 60
                 time_dict = {
                     'time_stamp': time_stamp
                 }