Merge "Suppress logcat error messages when frame timestamp is not found" into main