Cleanup screen notification code
Fix notification icon warnings
Text string fixes
Move up-client integration to power module