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

Change-Id: I3c578d3e3216cacf6f3b369f330605624422b58f