Merge "FP2-1225: Improved notifications panel" into fp2-dev-v2