Stop clearing old viewer flags when setting a flag (cherry picked from commit 171db639ffc8e79aac8d8d8e6a354f8d703a387c)