Common fixes, cleanupp

PS2: Missing import
PS3: Additional cleanup, Use ab drawable instead
PS4: Remove saving options on NavRing
PS5: Cleanup

Change-Id: I5d041cf27789b175f39d89ecb3f89541e3f88ecc
Merge "Common fixes, cleanupp" into jb3