pr-9718-93a222 vs. 5.0-14197 / ogl-lin-mesa / chibi-robo-zfighting

pr-9718-93a222 (93a222ce) Diff 5.0-14197 (b4ec5507)
77c144a38984a17fc398cab2903cd8bc4f066423 Waiting for diff... ac58b74d6a355e9200c96d4f22a4f822c508b2ac
44fc9a1c81b5da95d39892ff54306542a1f4aa69 Waiting for diff... f6942a2c9d25b9be0782294660c1c41322cbec31
a7e7930255871655419be7422ade18123accbe1f Waiting for diff... 67cb3159a2245b16f6aa05804986090f7deeeb1a