Claimview "movetoolbar" definition refactoring

Change-Id: I5670cdd26c0b870410c25f95f09fb6886654ee65
Merge "Claimview "movetoolbar" definition refactoring"