Merge "display: Remove C++ standard flags"