Merge "39612: Question Mark causes Eclipse Graphical Layout Editor to Freak Out"