Refactor shortcut view relevant code.

Bug: 112168722
Bug: 127406814
Test: Manually
Change-Id: I50947f464101a96e68c3932544d00bea28760949
2 files changed