Merge "Add @attr for justificationMode" into pi-dev