Merge "Fix NullPointerException in ContentRecorder" into tm-qpr-dev