* commit '6b225b0962c63d83d9f4dbe9a569ec8e7eb657b7': Fix some ActionBar menu issues around config changes