Merge "Update Back softkey icon Bug: 6020915" into jb-dev