Merge "Encode values when serializing android-app Intent" into main