Flag icon appears, need to set up proper conditions for appearance.
Making fixes.
Merge branch 'master' into AndroidFlaggingTasks
I think I committed properly.