Merge "Fix state of file context menu when state changes while already selected" into arc-apps