Merge "use relative positioning for notification actions"