Merge "Disable shortcuts per ecc list status." am: a0521acabf
am: 371461d4ae

Change-Id: I267e26b5e1bbc739ee57788b8b86e7c47289cd59