Merge "Support for max duration recording with effect" into ics-mr0