Merge "Add always on top feature support"