[FIX] Accordion Shift+Page Up/Down focus issue

Change-Id: Ib8415d39e88466d063879daa9130555617f065b8
BCP: 1482002930
Merge "[FIX] Accordion Shift+Page Up/Down focus issue"