Merge "Increase profile saver minimum save period to 40 seconds" into oc-dev