Confirmed fix for General UI FC / Hardware keys issue

Change-Id: Id95738879fd09ee68fa400f0e723d1d9c4a697ac