Merge "Fixing navbar and notification shade overlap"